From a1a7a3e42fbdde8dcf396314d5ccb017362c93a1 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 22 Aug 2005 08:51:04 +0000 Subject: [PATCH] Ordering was broken in the course of separating XEN-overridden sources from those getting used through symlink creation. Signed-off-by: Jan Beulich --- linux-2.6-xen-sparse/arch/xen/i386/pci/Makefile | 5 +++-- linux-2.6-xen-sparse/arch/xen/x86_64/pci/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/i386/pci/Makefile b/linux-2.6-xen-sparse/arch/xen/i386/pci/Makefile index 76c024abfd..898fbd428a 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/pci/Makefile +++ b/linux-2.6-xen-sparse/arch/xen/i386/pci/Makefile @@ -17,7 +17,7 @@ l-pci-y += irq.o c-pci-$(CONFIG_X86_VISWS) := visws.o fixup.o pci-$(CONFIG_X86_VISWS) := c-pci-$(CONFIG_X86_NUMAQ) := numa.o -pci-$(CONFIG_X86_NUMAQ) := irq.o +l-pci-$(CONFIG_X86_NUMAQ) := irq.o obj-y += $(pci-y) c-obj-y += $(c-pci-y) common.o @@ -27,6 +27,7 @@ c-link := $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)): @ln -fsn $(srctree)/arch/i386/pci/$(notdir $@) $@ -obj-y += $(c-obj-y) $(l-pci-y) +# Make sure irq.o gets linked in before common.o +obj-y += $(patsubst common.o,$(l-pci-y) common.o,$(c-obj-y)) clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link)) diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/pci/Makefile b/linux-2.6-xen-sparse/arch/xen/x86_64/pci/Makefile index 811fa0f200..25b13a3b4a 100644 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/pci/Makefile +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/pci/Makefile @@ -30,8 +30,9 @@ $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)): $(patsubst %.o,$(obj)/%.c,$(c-i386-obj-y)): @ln -fsn $(srctree)/arch/i386/pci/$(notdir $@) $@ -obj-y += $(c-i386-obj-y) $(c-obj-y) -obj-y += $(c-xen-obj-y) +# Make sure irq.o gets linked in before common.o +obj-y += $(patsubst common.o,$(c-xen-obj-y) common.o,$(c-i386-obj-y)) +obj-y += $(c-obj-y) clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link)) clean-files += $(patsubst %.o,%.c,$(c-i386-obj-y) $(c-i386-obj-)) -- 2.30.2